From: Ken Brown <kbrown@cornell.edu>
Date: Tue, 27 Jul 2010 11:10:48 +0000 (-0400)
Subject: * dired.c (DIRENTRY_NONEMPTY) [cygwin]: Use d_ino instead of the MSDOS definition.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18^2~567
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=6beef7f1aa1fe848af5df97e8676384f26cd3b5d;p=emacs.git

* dired.c (DIRENTRY_NONEMPTY) [cygwin]: Use d_ino instead of the MSDOS definition.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index f2feff2e7b2..beb01b9d136 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-27  Ken Brown  <kbrown@cornell.edu>
+
+	* dired.c (DIRENTRY_NONEMPTY) [cygwin]: Use d_ino instead of
+	the MSDOS definition.
+
 2010-07-25  Christoph Scholtes  <cschol2112@gmail.com>
 
 	* minibuf.c (Fread_buffer): Doc fix (bug#6528).
diff --git a/src/dired.c b/src/dired.c
index d4b0ff20db2..92a768da5be 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -72,8 +72,7 @@ extern struct direct *readdir ();
 #endif /* not MSDOS */
 #endif /* not SYSV_SYSTEM_DIR */
 
-/* Some versions of Cygwin don't have d_ino in `struct dirent'.  */
-#if defined(MSDOS) || defined(__CYGWIN__)
+#ifdef MSDOS
 #define DIRENTRY_NONEMPTY(p) ((p)->d_name[0] != 0)
 #else
 #define DIRENTRY_NONEMPTY(p) ((p)->d_ino)